Sync with function in need of debug

First to debug wins a pizza.
@orpgol @NataliGil @yuvadm