Merge branch 't/recycling'