This is closely related to an existing FR from last year.
I will leave it to @IvyAudrain to review and consider if a merge is beneficial here.