BZ-8668 minor fixes(plaveholder)
Merge remote-tracking branch 'refs/remotes/origin/pm2waySync' into pm2waySync