Merge "Provide some compatibility story for devs in the past"