Merge ssh://github.com/TOGoS/TMCMR