merge origin/dev into fix/stale-running-session-ui