Merge from trunk, fix for another 6940394 regression.
add additional untracked files