55eaecb3c8
(cherry picked from commit 063dba22a803295adee4fdcbe42718af3e85ca78) Closes #4679
(cherry picked from commit 063dba22a803295adee4fdcbe42718af3e85ca78) Closes #4679