Merge pull request #3981 from kumpera/fix_symbolification_issues