trunk -> 2.4