IDEA-80056 carets architecture change