Issue #2316513 by mrfelton: Update Features to 2.2