(cherry picked from commit 57edf92e30cd3e5bec594399b8a21fc1da31d549)
(cherry picked from commit 1a92c63ef6d60e9dcba513ebf60cbd9f18a142e8)