Cloneable group template control update

Change-Id: Ieb1858febdd57db661b7931c9d6e415594d22ba2