Merge branch 'feature/egg_drop' into develop