Merge All to Elan

Merge master in Elan