integrated latest fixes