DEVP-3025: fixes