Follow-up of #5374