MLDS-314 fix dependency cycle