longbill feather drop fix
Merge branch 'stable' into dev