merge two similar MY_CXT code branches