Optional disable based on the session refs #1