Implemented generic part of RFE #1880202