merge back buoyancy_improvements. shared static buffer size changed - pulling this changeset requires an editor restart.