IDEA-36137 initial commit