Use the correct resource to load. Will avoid random NPE.
Merge branch 'master' into 'BS-9319_DevCollabImprSVN'