Update for clean-platform!272 (merged).
This will create a new commit in order to revert the existing changes.
