Merge "Load resources for the correct user" into jb-mr1-dev