overrides
(cherry picked from commit 79c7ba5642b71604cac62936c8d44053c16d509d)
overrides, nullability
(cherry picked from commit 1918d6ea55854cbe1bc330e25087d37cb8616195)
overrides
(cherry picked from commit 89d03b1fdde38db36452c195e2e8b0bbe8f453d3)
cleanup
(cherry picked from commit f9411d3f8ea5f0406bf49b857cc361d9fd6f1b41)
IDEA-114604 Evaluate Expression doesn't change context after navigating call stack +review
(cherry picked from commit c5ce0b8fc9e2a204e100581f4b4d7045c3f65b88)
fix after cherry-pick