LPS-44988 update interfaces and remove circular dependency
LRDOCS-960 SF