Merged with 2.10.x.
Published against 2.11.0-M6