Fixes #8201 Fixes #8202 Fixes #8203 Fixes #8204 Fixes #8205 Fixes #8207 Fixes #8208 Fixes #8209 Fixes #8210 Fixes #8211 Fixes #8212 Fixes #8213 Fixes #8214 Fixes #8215 Closes #8216 Fixes #8217 Closes #8218 Fixes #8219 Closes #8220
(cherry picked from commit fb76c237bfbb8aa43bcdd9ce34d90ea843011cee)