Merge branch 'refresh'