icx/rcx changes, for merge
forgot
rcx (merge fixed, fixed usage)