Manually close old PR

Closes #1588
Manually close old PR

Closes #544