Disable persistent connect
Merge branch 'dev'