Similar changes as those made to v1.14