Initial patch moved to 4.0.0