This should have been included in !84 (merged), but I didn't have time to test it, so I preferred to make two MRs.