[Jrst-commits] 01/02: Merge tag '2.4' into develop