(cherry picked from commit 24949d74093fc2be5c5b05a63fa4db5d6d074817) (cherry picked from commit 81fc0e6343fe7ef17189a33f1f7d58d71cf24df0)