Import #457 to v2.0 beta