UAR-875 Merging release back into master for release 5.2.1-release8 with fixes for UAR-807, UAR-839, UAR-840, UAR-849, UAR-864, UAR-873