Merge "Update flag value" into tm-dev