proposed v2.0.5