Redo UAR-785 with copy from Master branch