#GH383 - configure branch review 2

Done :)