Merge dev with master (add min support)