Merge origin branch 'viciious/qfusion'