Merge "Enable next row id backup flag" into tm-dev