UAR-706 Changes for additional change request