[MERGE] merged fix of bug 727162