Merge "Addressing API comments." into main