(cherry picked from commit 5b9483bf9549def17eab8c79c5c5b807e80a72bd)
Import commit 91d60335005d38c4fa34b1cc3c835a0ec15983ed