Merge pull request #7967 from ja-pa/measurement-kit