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