Merge pr 4532

Merge pr #4532