DISPATCH-1608 - Additional fix. Make change backward compatible
1 file changed