latest wednesday 9.44 am.
Merge remote-tracking branch 'origin/manual-control' into manual-control