This is a cherry-pick of version [b5df5ac052].