Sqlite and Mysql don't support returning clause
Merge changes from branch 'master' into dev