[[ Bug 13267 ]] Break out of wait in response to currenttimechanged() or markerchanged().
Merge remote-tracking branch 'panos/bugfix-13267' into bugfix-13267
Merge branch 'bugfix-13267' into develop