VID-1976 fixing after upstream merge