Implemented RFE #2485684