Merge "Always reference injector using get method." into jb-dev