Merge "Fix scan flags"