Add tunable to check whether user wants to really load a new session

Change-Id: I01f7eec8d4ddf6ccb0ef41b15983e4f0e02ed4ea
Merge branch 'hotfix/3.0.1' into develop