[#51595189] updated billing logic
Merge pull request #16 from dscataglini/51595189-legacy-bundle

[#51595189] updated billing logic