Merge "Prevent committing session while in progress" into tm-qpr-dev