Added additional name filter. Causes some test not to run.
Merge branch 'master' into sqlite_rename