Initial changes to have remote_script machine tag.