[[ Merge-6.7.1-rc-4 ]] Fix for few mismerged lines