ZEN-10209

The pull request also contains small UI and documentation changes.