UAR-710 merging release to master for release 5.2.1-ua-release2 with fixes for UAR-622, UAR-541, UAR-605, UAR-592, UAR-563, UAR-655 and UAR-564