implementation of feature request #1423
implementation of feature request #1423
Fix merge conflict