Backport Everything 1.5.1-1.5.2