Manually merging branch

Re-merging SQL-LITE branch