Merge "Fix last tile bottom calculation" into tm-dev