Merge pull request #3824 from 9rnsr/fix13221

[REG2.064] Issue 13221 - [ICE] '0' on line 318 in file 'interpret.c'
Merge pull request #3388 from 9rnsr/fix12242

Issue 12242 - conflict error with public imports