Updated version (cherry picked from commit 63c1eaf)