@techee please do not force push unless absolutely necessary, especially when you know testers have copied your branch, git pull now fails to merge with a conflict in tm_workspace.c.
Yeah, sorry, I wanted to update also a commit message which wouldn't have been possible with simple fixup but should have created a separate commit instead.