Replaces #24754.
Pulled in the original commit from @agriffis and updated it with latest from v4-dev. After doing that, I had to update the usage of the mixin to remove a now unnecessary if/else block.
Replaces #24754.
Pulled in the original commit from @agriffis and updated it with latest from v4-dev. After doing that, I had to update the usage of the mixin to remove a now unnecessary if/else block.