adjust for cif-smrt v1-v3 merge