Merge dev-new-sessionInProgress