am 51205042: Merge "Quick: Reduce memory usage and improve compile time."

* commit '51205042343fa4852e01919de01fdcf261af510b':
  Quick: Reduce memory usage and improve compile time.