[1.1] Backport WELD-1802, WELD-1774, WELD-1690