Merge "Fix formatting of table." into tm-qpr-dev