fix bug, buffered envelope
Merge branch 'feature/geo-refactor' of github.com:Kotaimen/mason into feature/geo-refactor