IDEA-122565 (CVS: files shown not under version control in 13.1)
(cherry picked from commit f8551ee)[CR-IC-4902]