Backport mm-convert-shr-links fix from master (bug#23964)