Morph layout_raw query into layout_of.
#88308
+54
−94
Merged