Using build time configure
Merge remote-tracking branch 'origin/cleanup_and_rename' into next

* origin/cleanup_and_rename:
  Using build time configure