Added echo output to build.sh to identify error stage.
Merge branch 'v5-stable' into v7-stable