K 10 svn:author V 5 markj K 8 svn:date V 27 2018-11-13T17:43:16.338996Z K 7 svn:log V 73 MFC r340331: Re-apply r336984, reverting r339934. Approved by: re (gjb) END