Initial commit for the framework patches v1.57