Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging