Ready for introduce changes to arrive to the v1.12