Merge "Add some missing overrides in EnumMap and DelayQueue" into main