[2.0] make image parent check more robust#7556