XD-1321 Fixed build script task dependencies