59749acf50
(cherry picked from commit 2508b5ac18)
closes #7058
fixes #6963
(cherry picked from commit 2508b5ac18)
closes #7058
fixes #6963