Merge pull request #10677 from ja-pa/measurement-kit-update