REVIEW-3497: Update to breaking changes in release notes. Minor change to component selector maching method.