Prettify for easy readability, #6735 Closes #6735 See merge request !1929
mentioned in commit 4d2934a5
mentioned in commit 3b027fb5