[BZ 970784] Fix GUE on new deployments