[MAGEMEP-125] Adding child category filter support
Merge branch 'master' into MAGEMEP-125
Merge branch 'MAGEMEP-125'