Merge "fix Surface positions are not floats"