5673b9b142
previous two commits and combine them with the existing flags that were already there. Pointed out by: ru@
previous two commits and combine them with the existing flags that were already there. Pointed out by: ru@