Add $(rlocationpath(s) ...)
expansion
#16653
Merged
$(rlocationpath(s) ...)
expansion
#16653