IDEA-80056 cleanup
IDEA-80056 edge cases