Merge leandro changes.