resource and limits
Merge branch 'develop'