fix Issue 13835 - ICE in interpret.c:736 - Issue with static variables
Merge pull request #4203 from 9rnsr/fix13835

Issue 13835 - ICE in interpret.c:736 - Issue with static variables
fix Issue 13839 - Use new style for alias declarations in di files