Change tested up to v3.6