Merge "Fix undefined $db"