merge in rs.js PR #693