[TIDOC-1117](3_1_X) Resolve merge conflict