Final merge for 1.0