@ohadlevy I think we can use this for now and revert after upgrade.