Merge branch 'develop' into enhance_resources_apiroutes