Update 2.0 branch with changes from master (merge this last)