Import #456 to 2.0 branch