am 788fb96d: am 47653f2d: Merge "Move options buffers to top scope"

* commit '788fb96d7f1cfe27cf8dd56a053258964427286f':
  Move options buffers to top scope