Merge "[SP25] Rename functions that add Entry conditionally"