Backported changes from the working package.