Merge branch 'dev' (cache-lists release)