Squashed 'rpoptjs/' changes from 33821f1..ad2b42b

ad2b42b fixed argument grabbing

git-subtree-dir: rpoptjs
git-subtree-split: ad2b42bd5af6a5d863e7e3120f4d7819c13bbe55
Merge commit '29677559c8a4c9191bda64b39c5dd9c5fd998c61'