Best version to this date, based on the SWIFT master.
One squashed commit as the others are getting unclear.