Merge branch 'refs/heads/hotfix-columnizer' into develop
fixed trigger
Merge branch 'refs/heads/hotfix-subfilter-position'