IDEADEV-41774 (Subversion changelist & IJ changelist) r=nick