(cherry picked from commit a11d82a42729eba02032310f7778a9197f4f8ead) (cherry picked from commit bebc244156)
bebc244156