Slight fix.
Merge remote-tracking branch 'origin/staging-trajectory' into staging-trajectory