Fixed various dependency issues
Merge remote-tracking branch 'origin/17' into 17
1.6.5