166f87ae68
(cherry picked from commit 1e89a1a3cb8fa83e4415b047513cbecacbebc59c) Closes #5176
(cherry picked from commit 1e89a1a3cb8fa83e4415b047513cbecacbebc59c) Closes #5176