Merge "Revert "Revert "sound trigger: several data structure updates"""