removing loader
Merge remote-tracking branch 'sharp/master' into develop
Updates-120614