Merge "Revert "Test that rs_script_call_t works properly."" into jb-mr1-dev