Massive performance improvement to updating
Version to 3.18.6 for release