Merge changes from topic "res-loader"

* changes:
  Refactor ResourcesLoader Tests
  Refactor ResourcesLoader APIs