Merge "Correctly find last visible usage in chain" into sc-dev