[TASK] Update to latest state; bulk changes in provider etc.