Further exclusion from package namespace: constant holding classes DistributionType and PaymentMethod.
Merge branch 'release/1.2.1'