[Bug 1491457] Enable optional features