Merge branch 'fix/api-v1-instance-absolute-urls' into 'develop'