Null merge from sqlite3-logging, everything was cherrypicked earlier?