r/m debug output
merge from 1.2