Add wrapper in Query block and align
support
#30804
+125
−14
Merged
align
support
#30804