Changes related to build script, also squased recent commits

Probably we need workflow states?