merged with the latest changes from sorin repo.