update to pre-4.87 master