Added missing newlines.
Merge remote-tracking branch 'origin/kj/rename_and_then_work_fix' into kj/rename_and_then_work_fix