am 38f7dcd7: DO NOT MERGE. Test for Configuration differences before changing.

* commit '38f7dcd7dcb5d98d86f19f3c4725aea89f9792ff':
  DO NOT MERGE. Test for Configuration differences before changing.