Keep target API consistent with master branch