Merge remote-tracking branch 'flare-engine/master'