Fixed build script and context diff to work properly without requiring developer intervention.