Changes for v1.13 build