Merge "Make mapElementsLazily thread-safe" into main