Merge "Moving flag creation to a separate file" into udc-dev