Imported update of RP6 library