Merge dev-gui-sessionInProgress

Hey someone!

Would you check out this pull request and make sure it doesn't break the build?

Please and thank you!