am 43ef013c: (-s ours) am 38f7dcd7: DO NOT MERGE. Test for Configuration differences before changing.

* commit '43ef013cbd769533737135af5a338898cc619602':
  DO NOT MERGE. Test for Configuration differences before changing.