Add public src build tools
Merge remote-tracking branch 'origin/master'