Change in Loader not merged from master. Strange.