merge fixes from branch morphemic-rc1.5 to morphemic-rc2.0