make sure resource_context_requirement.requirement is not null
Merge branch 'development' into stage