Please review this patch. Will apply to V2.5-stable once it is reviewed.