Uplift bug972276 to v1.3t