Revert "Revert "R0331012""

This reverts commit bde603c0746040786981a9f62c6999a2cc445808.