BZ-8687 moved filters into markups
Merge remote-tracking branch 'refs/remotes/origin/pm2waySync' into pm2waySync