Merge commit '05c776477c1daac5ca53f8e3e39868555d0dedab' * commit '05c776477c1daac5ca53f8e3e39868555d0dedab': Fix regression.