Merge remote-tracking branch 'bohrsty/206_log_to_oc2'