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