merged with latest revision