Backport Everything 1.4.6-1.4.7