Changes were merged from the Git patches on T3501
I created a Differential request for this change; not sure which you prefer.