K 10 svn:author V 6 kevans K 8 svn:date V 27 2020-02-14T18:50:03.501044Z K 7 svn:log V 172 dtc: re-apply r353961, r354115 I missed in final review of r357923's diff that these ones hadn't yet been sent upstream and inadvertently reverted them. =-( Re-apply now. END