Preparing to branch to API version 1.15