Use resource loader#683#684 second try

resolves #683
resolves #684