(cherry picked from commit 150c430f) (cherry picked from commit d08f6fdd)
mentioned in commit 6773496d
mentioned in commit f4777883