Split from D4589 Differential revision: D4600 Original patch by: @Langbart Fixes: #6486 Refs: #6116 This was SVN commit r26775.