PRD-4738 (fix based off master, instead of 5.0)

Helps github merge the beast via UI - me lazy.