it is not needed to check for associated resource
Merge branch 'develop'