Merge "Add safety comments." into main