[UF-70] Some api changes for backport compatibility