(cherry picked from commit 47bb88d8924543f00900f594b8eabfb37813fb0d)
(cherry picked from commit ff6f05df84c223f6df7676f1ffd2a5da09813c18)