IDEA-128676 (test added)
IDEA-128685 (test added)
Merge remote-tracking branch 'origin/master'