IDEA-80056 optimalizations