Merge "Fix the use of uninitialized skip flag"