Merge pull request #15189 from dvd42:keypoints_module