(cherry picked from commit b49e14d5) (cherry picked from commit a20a2157)
mentioned in commit 41be415c
mentioned in commit dbbfc23f