Revert 271742@main and 271737@main because test revert issue .
*** This bug has been marked as a duplicate of bug 266089 ***