Upgrade up to SF 2.4.x