Apply single particle momentum patch to 1.18 as well

parent 972a60cf

This commit is part of merge request !203. Comments created here will be created in the context of that merge request.