Merged from main. Debug details for proximity-based mixing disabled.