Patched from origin/cvimrc