Integration of latest changes