Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instan...