DSC-926

Second fix

Signed-off-by: mossrocket <peter@mossrocket.com>
Merge remote-tracking branch 'origin/master' into dsc-927