Merge remote-tracking branch 'origin/add_cookie_based_session_support' into add_cookie_based_session_support