Bug875963 uplift 1.3 t