Cleanup (shared instance, typo)
IDEA-132411 (read action; diagnostic)
IDEA-132411 (bundlification fixed)
Merge remote-tracking branch 'origin/master'