Crashbug X

Ref: GENF-EN009