Merge "Plumb client target property." into rvc-dev