Merge "Start making RS 64-bit clean." into jb-mr2-dev