Merge remote-tracking branch 'origin/Bird&Formulas'