Merge "RS driver refactor and bugfix for 64-bit"