(cherry picked from commit 2fef50cd) (cherry picked from commit f2763ff6)
mentioned in commit 6eecf085
mentioned in commit ecbb5a4f