Backport Everything 1.3.1-1.3.2
by samfortyseven