Merge branch '2.4.0-bumps' into 'main'

Version bumps for the 2.4.0 release

See merge request !4039