fixed problem with empty templates after applying a valid one
removed console
Merge remote-tracking branch 'origin/CDB-1226' into release/2.6.2