2.0.0 improvements  v3

Please do not merge it yet.