Only the patches ragrding the flag from the current master was
taken over, the other falgs are still needed and used.