V2.5.4 & CONTRIB-3240