Created attachment 194556 [details] patch Builds on 11-STABLE.
The wanted changes are made in ports r488555. Close here, overcome by events.