Merge "Adding the generic solver code"