Fix compile issue
Merge remote-tracking branch 'fitzchak/New3' into new3