(cherry picked from commit 244e44af432121a05e0a308b7ccce96a8ecd28ab) (cherry picked from commit 79fad84b)