Implementation of feature request 785