Implemented RFE #1899189