handle optional build version
Merge remote branch 'origin/1.12'