Adapt to ETM switch from CR to Monitor

Authored by rwooninck on Sep 16 2016, 7:19 PM.