Ide 1240

You can merge this after IDE-1247 has been merged.