include latest changes from Berg