Some updates to 12172