Merging first phase of redir-logs into v1.61