Part 1 of Customer Fix for UAT