UAR-869 Release 7: merging release to master for release 5.2.1-release7 with fixes for UAR-626, UAR-661, UAR-756, UAR-790, UAR-806, UAR-818, UAR-823, UAR-847 and UAR-848