Issue #2208783 by mrfelton | lsolesen: Added features override.