updates resulting from the merge with the fix branch.