Merge branch 'relay-list-change' into 'develop'