Merge "Correct infinite loop in swicms_set_cmn"