Merge "Change UT to disabled by default"