Is this correct? Or is this a merge issue from me merging dev-master into dev-3.x?