[ros-diffs] [janderwald] 42755: - Add members required for usermode-mixing support