Merge fixing of unify build script due to new jasy version