Merge "Adjust UUI to latest (Amsterdam)" into release-1.1.0