Merge "Fix flash"