Normalize build fix
Merge branch 'version-1'