Fixed empty resource bug
Merge branch 'master' into HEAD