Trebuchet include moved to vendor
flags rework