Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation