Pulled octoflat changes from upstream