Adds template override by clientID

[#76885084]