2.25 Jan 11th -- merge branch