small has many.add refactor
Merge branch 'refs/heads/master' into mark