Merge "Add outside targets explicitly" into main