merge fixes from REL1_4