PRD-4841 - Fixing crashing layout error; 5.0 backport