Merge Module Assembly - Payment Preference APIs

Resolved conflicts to 07c3c82. Please pull.