merge latest changes from master. fixed the regression in xenoblade sound