7835b0b7
Merge commit '7835b0b742a36641a4005663134dc0b5d0678eab' * commit '7835b0b742a36641a4005663134dc0b5d0678eab': Fixes #1882836.