Merge commit 'd92593bb6e2e80b03bd261e9e86c0907b6939200' * commit 'd92593bb6e2e80b03bd261e9e86c0907b6939200': Change handling of remoteUuids.