needed to check for null resource itself as well
Merge remote-tracking branch 'origin/develop' into develop