Merge "DM: use the right terminology for divisor" into tm-dev