Remove the prefix in the build
Merge remote-tracking branch 'origin/master' into DevTools_alyx3_2