Merge commit '692dfafe02d04cdbab5367546e166580c92e4d2e' * commit '692dfafe02d04cdbab5367546e166580c92e4d2e': Fix issue 3007862
Merge commit '692dfafe02d04cdbab5367546e166580c92e4d2e' * commit '692dfafe02d04cdbab5367546e166580c92e4d2e': Fix issue 3007862