Merge "Depecrate flags, and try to match them to actions"