Security Updates for v2.1 and v2.5 series