Merge dev changes to main