Merged with updates from sister repo.