Two isses with duplicated properties were fixed in master but not in 22.0, porting the fixes to keep this legacy branch in a clean state build-wise.
Two isses with duplicated properties were fixed in master but not in 22.0, porting the fixes to keep this legacy branch in a clean state build-wise.