Merge branch 'jn/fortify-source-workaround'