Merge branch 'incoming' into linking