Crashbug Y

Ref: GENF-EN010