Merge "Update debug printing." into tm-dev