Sound Effect Fixes from develop branch (manual port)