Support also framework extra bundle branch ~3.0