-Fix various issues with predictive ids
Merge remote-tracking branch 'origin/master'