Merge branch 'bugfix/notice-urls-should-return-objects' into 'develop'