FIX: update project to the latest build scripts findings
Merge remote-tracking branch 'origin/master'