update resulting from the merge with master.