Please review branch feature/ZEN-8667

beta2 was released, so this should be safe to merge now.

This pull request fixes both ZEN-8667 and ZEN-8673.