MDL-63401 core: Do not delete the user context