Cherry-picked commits that ended up on wrong branch