(cherry picked from commit 1e8945de63f398fd2284843c5a70283b3ea18bf6)
(cherry picked from commit 738d15087acc750a7476e82f3e41bf935f9960ac)