Marge dev into master (v2.0)