Update for RAC/architecture-improvements branch