Merge dev into main after last days of development