Cherry-picking@ 3rdJUly