Same as ticket [3ce0ea97522581], fixed by checkin [336e194c4d]