Fix autofold imports issue#1208#1224

malucky wants to merge 2 commits intocodelab-fun:mastercodelab-fun/codelab:masterfrom

malucky:auto-foldingmalucky/codelab:auto-foldingCopy head branch name to clipboard