IDE-1268 backport to 1.x