Core + contrib updates

Tested locally, looks ok.