Merge "Use new aliases property to rename dependencies where necessary." into main