Closes #7369
fixes: #5941 fixes: #7234 fixes: #7235 fixes: #7236 fixes: #7237 fixes: #7238 fixes: #7239 fixes: #7240