(cherry picked from commit 137d4487) (cherry picked from commit 98a34946) (cherry picked from commit cd7d8bb9)