Merged rs changes with Linux update from repo