Hi Marshall, Is this OK to merge to the 4.0 branch?
Yes, that would be fine.
Approved. Eric you can go ahead and merge this to the release_40 branch.
Merged in r302070.