Merge branch 'bugfix/filter-id' into 'develop'