update with recent changes in SWIFT

Merged Loic Hausammann requested to merge update into master

Merge request reports