bd
Merge branch 'eq-luis'