Backported final changes. Testing on 11.04 + 12.04 systems