Merge branch 'feature/sess_db_destroy' into 3.1-stable