@parras, @gedenhof could you please double-check whether this looks appropriate to you? I wanted to keep the impact on users as small as possible.