Security update merged from 2.1.