#760 Handling of remote templates