Uplift Bug 875963 and Bug 959175 to 1.3t