Merging in KRACOEUS-6905 to resolve stack trace.