Merge "Fix check_vim_capacity"