[ #52819 ] Minor changes before tagging 1.4.1