Filters restyling
Merge branch 'ADP-Style_hotfixes' into develop
fixed merging conflicts