bugs 36262, 36314, 36128 fixed upstream