speaker fix
Merge branch 'release/r19' into develop