(cherry picked from commit 0939d32)