Implemented RFE #1702376