Fix size collection
Merge branch 'master' into flux