Changes from 12.10.