Cherry-pick files from the other branch