Also, additional clean up. Basically, cherry-picked commit #5f98c7c5 for MR 2204 comments.
Attach a file by drag & drop or click to upload