Merge "Bump patch version" into amsterdam