Committing changes
Merge of working branch projectA-1.0.49-branch to release branch release-1.0.17-release-branch

* projectA-1.0.49-branch:
  Committing changes