Merge "Remove wf* function and global variable usage from DatabaseSqlite"