Prepare for v2.4.0