2.4.0 wip

Wanting to do a pull request for Issue #248