Automatic biicode generation and deploy
Merge from upstream fixed