[#51595189] updated billing logic