Merge with patch v1.0