Merge remote-tracking branch 'jens/for-4.1/core' into dm/for-next