Add more platforms
See merge request !4057 (merged)
(cherry picked from commit 9f42e560)
ae306282 Fix collections a75e114a Add missing platforms 4eb6486d Fix order b74ac4a0 Revert "Fix order"