K 10 svn:author V 5 markj K 8 svn:date V 27 2020-06-15T03:02:19.347366Z K 7 svn:log V 93 Revert r362187, it contained some unintended changes. This is a direct commit to stable/12. END