fixed PY-11673 Error on project creation
added special case workaround for  IDEA-111701 according to CR-IC-3788
Merge remote-tracking branch 'origin/master'