(cherry picked from commit 514aab46d9548bfee50b5d0af36e287da10363b5) Co-authored-by: sakridge <sakridge@gmail.com>