[1.2.5] Implement #987

See #987