updates for daily worklog #14388#