Also took the opportunity to split it to multiple outputs (cherry picked from commit 2cd5cf624ae19fd7633a22ea3a3f7986dfb611af)
Also took the opportunity to split it to multiple outputs (cherry picked from commit 2cd5cf624ae19fd7633a22ea3a3f7986dfb611af)