Merge branch '54855-m' into 'master'

Resolve #54855 "M"

See merge request !28
5 jobs for master in 4 minutes and 2 seconds (queued for 2 seconds)