Merge branch 'view_bobbing_and_vielded_tool'