Merge "Do not throw exception on Mac#reset"