improve flag threshold reached message slightly
protect against crash in prd
Merge remote-tracking branch 'upstream/master'