DOMINATOR-23530

DOMINATOR-23530