Implement #1370