Merge "Moving libRS"