backport o2m_ and colspan from 2.1 process.html