Merge "Fix resource reading for secondary users" into jb-mr1-dev