Rollback session on any exception caught in middleware
Use an empty string instead of None if no cluster is selected
Merge branch 'master' into u/ixa1