Jan declined the review of SR#360495 due to the ABI breakage. Dave, what alternative solutions do you propose? Additional packages would be fine, just not changing things about.