Merge pull request #3483 from ivantcholakov/develop

[ci skip] A minor header update, CI_Session_driver.