Squashed 'moduleA/' changes from 9cb8d57..b2b31c1

b2b31c1 edit from develop branch
3c5b079 Merge commit '30d89275c5c905169574555863ca4a41c8b4dabb'
46080ca adding conflict to project1

git-subtree-dir: moduleA
git-subtree-split: b2b31c1b2c2db0788fcc3b8c49e220f3177b4e0f
Merge commit '9340b8c9056d515c1888e4a1570d6dac848dc1ce'