Merge changes from upstream (mastahyeti/OctoGAS)