Merge pull request #3293 from esdrubal/mono-sym-fixes