Backport Everything 1.4.2
by samfortyseven