Merge branch 'feature/relay-tests' into 'develop'