BZ-8668 address fix
Merge remote-tracking branch 'refs/remotes/origin/pm2waySync' into pm2waySync