0.18.0-dev.7: MR !482 at its REV-passed head c4c4aa24