(cherry picked from commit 413cb7f)