UAR-574 merging release branch back into master for release5.2.1-release1 with fixes for UAR-491, UAR-418, UAR-508, UAR-518