Merge pull request #8700 from ja-pa/measurement-kit-0.10.1