#955 for 1.3.0

See #955