Merge changes from topic 'fix-amsterdam' into release-1.1.0