Merge from dev

Merge didn’t work, so I did it this way