COH-72: some fixes
COH-72: some fixes

Doing semantically better thing for COHEAT
and testing manually merging trivial changes from master.
opentrv/opentrv,opentrv/opentrv,opentrv/opentrv,opentrv/opentrv,opentrv/opentrv