Merge pull request #1497 from Azaezel/soundEnumExtendability