Added in missing context. Part of fix for SDEV-521