merged v2.0 changes