[TIDOC-992] Fix merge discrepancy