[cpanspec/f20] (3 commits) ...Fix #739461 and #708377