Merge "Set the skip flag to 1 for skippable blocks"