Merge remote-tracking branch 'origin/master' into DE90623_class_format

Handle array stereos