corresponding to third OTT 2.2 tarball. reworked flags