oops, commit Configure part of PR#2234