1da31e622f
Closes #6734 (cherry picked from commit 818471b7e137a15dce48352f686db24b117414ea)
Closes #6734 (cherry picked from commit 818471b7e137a15dce48352f686db24b117414ea)