Closes #9512 Some were skipped because they requires full rewrite (cherry picked from commit 3041c3ae36d73cb89df107765f33cf14955ad07c)
Closes #9512 Some were skipped because they requires full rewrite (cherry picked from commit 3041c3ae36d73cb89df107765f33cf14955ad07c)