CLSN-1846 : moved to IRepo