Merge branch 'release/filters' into develop
Merge branch 'master' into develop
limit left div max height