[CB-2831] Removed automatic template laoding into VS