Merge remote-tracking branch 'upstream/configuration-api' into configuration-api

4 jobs for configuration-api in 15 minutes and 27 seconds (queued for 13 minutes and 16 seconds)