Merge branch 'jf/merge-ignore-ws'