Issue #2377371 by dsnopek: Updates to work with D8.0.0-beta3, Support variant titles