================== DO NOT MERGE =========== Tmp CN bug fix

Temporary work-around for unmerged bug fix.