UAR-794 merging staging to master for release 5.2.1-rel4 with fixes for UAR-625, UAR-649, UAR-672, UAR-673, UAR-676, UAR-708, UAR-720, UAR-742, UAR-766, UAR-773