Updates to 14427 and 12172