Merge change 2096

* changes:
  Implement architecture-dependent defaults.