OP-1599 added new mode "courselock" in handlers where missing