Merge and small fixes