Hi Fujii,
I'd suggest committing it to master only.
I tried 14, 17 and master. The extra clause is a no-op on restore,the rows come back the same either way. Nothing is broken, so I don'tsee a reason to touch the back branches.
Thanks,Shihao