============ DO NOT MERGE =================== CN tmp bugfix

Temporary work-around for unmerged bug fix.