(cherry picked from commit bc130b68) (cherry picked from commit b4eb8848) (cherry picked from commit f14fa558)