- Merge master into bleeding and update Common for drop fixes.