ignore-working on QFT references
Merge remote-tracking branch 'upstream/master'