we removed _RTIR_ prefix from CFs, fix add_constituency
(cherry picked from commit 318135fb5d9e198b41acb6c4415590a3758062da)