Merging latest changes in zoom buffer branch
Another merge but on a separate branch so we may hit the same issues with a conflict with master in past... we'll see.
Another merge but on a separate branch so we may hit the same issues with a conflict with master in past... we'll see.