Merge "Fix one flag setting bug"