Merge "Update modules/(test-)requirements"