Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding