Please find ​this commit in my task-22217 branch. I hear Samdney would like to take this one. Samdney, whatever you find, please just comment on this ticket and write down your thoughts or questions. Thanks!

Looks good. Merged into mine together with a few whitespaces fixes and after prefixing instance method calls and references to instance variables with this. to be consistent with the other code.

Open topics I noticed in other parts of the code:
The empty key issue seems to also apply to comma separated key-value pairs and maybe others. Similarly repeated keys. New ticket?

I included a fix and tests for empty keys. I briefly pondered adding checks and tests for duplicate keys, but I'd rather want to postpone that discussion in order not to de-stabilize master this close to the release. Maybe we can combine that with a minor code cleanup where we're duplicating less of that parsing code. Want to create that new ticket?

It would be good to add the check for the correct exception string also to other test methods in ExtraInfoDescriptorTest. Another ticket?

Yes, new ticket sounds good. Mind creating one?

If you like ​these changes, I'll merge that branch into master and start preparing the release. Thanks!

Looks good. Merged into mine together with a few whitespaces fixes and after prefixing instance method calls and references to instance variables with this. to be consistent with the other code.

Thanks!

Open topics I noticed in other parts of the code:
The empty key issue seems to also apply to comma separated key-value pairs and maybe others. Similarly repeated keys. New ticket?

I included a fix and tests for empty keys. I briefly pondered adding checks and tests for duplicate keys, but I'd rather want to postpone that discussion in order not to de-stabilize master this close to the release. Maybe we can combine that with a minor code cleanup where we're duplicating less of that parsing code. Want to create that new ticket?

It would be good to add the check for the correct exception string also to other test methods in ExtraInfoDescriptorTest. Another ticket?

Yes, new ticket sounds good. Mind creating one?

I'll create the new tickets, sure.

If you like ​these changes, I'll merge that branch into master and start preparing the release. Thanks!