(cherry picked from commit 949096f776294eb8ce95df518abd631f735c29ba)
(cherry picked from commit e535384f4539f303064680454bb86b938465fe16)