Merge "Also freeze configuration when freezing bounds" into nyc-dev