Merge v1

In which case is this triggered?