(cherry picked from commit 2d65626630c19bb8159a025accb18e5179da5dc3) (cherry picked from commit 05d29443)