Pull 4703

I had to remerge #4703.