Update build scripts
Merge branch 'JBX' into JBX_STABLE