Merge branch 'fix-relay-repeat-notification' into 'develop'