v2.4.0

Mainly backend code changes, in preparation of v2.4.1