Merge branch 'net-more-bulk-free-users'