MT#5225 MT#5701 fix scenarios after changes on templates