(cherry picked from commit 4387806e)
mentioned in commit c5b66028
mentioned in commit 170bb87a
mentioned in commit 61ea0c09