prep work for v2.8.7