Merge "Enable Int and String flags." into tm-qpr-dev