* Merged with default branch at rev bac772081960.