For ENG-5256, more trailing whitespace