Re-rolled patch #44, Updating prefix for dependencies.
Added interdiff for same.