Please see worklog for details on files changed.