Adding feature request #2321