Merge branch 'ide-1.5.x-jssc2' into ide-1.5.x