Merge "Simplify map_or_log_err" into main