Export field_flag and set default value in db update
Merge remote-tracking branch 'origin/master'