New CMR with bug fix in module completion