- Closes #12454 # Before  # After  Signed-off-by: Yarden Shoham <[email protected]>