T dev

has updates from Patterns commit #df339b7242ea488bec3f7314f8c83b1195894718