UAR-769 merging release to master for release 5.2.1-ua-release3 with fixes for UAR-696, UAR-606, UAR-620, UAR-680, and UAR-693