Merge pull request #23885 from arjantijms/metrom42