Merge "Move options buffers to top scope"