Merge "Removed redundant resource loading code" into devel/master