Leia 18.0-beta5

Closed Nov 3, 2018 100% complete