Merge branch 'feature/1392-support-irreversible-filters' into 'develop'