Merging issue 171 resolution and partial wave 10 implementation