Update from 12/6 version.