Merge "Add ipflush for manual interfaces"