Merge "Add helper method to override flag"