Merge branch 'collections'
fixed log problem