Merge "toolbox: make "r" available for /vendor"