TIDOC-1021 Fixed errors introduced in merge.