feature request 10812