Fork for ticket 1425620 - Features Module Support