(cherry picked from commit 6b310afb07efcb38841220d9ba2b30ce25e57ffb)
(cherry picked from commit ba25cd20893cb783bd5a83c6c992ff680128b685)