merge latest fixes