Synchronise with the most recent version

All files have been backporting from the published extensions.