Merge branch '1838_add_enca_support'