CLSN-998 : popup template support