3.26.5.1 - December 21, 2017 ============================ - Correct logic to avoid corrupting session state