Merge "Vendor: Bliss: Allow custom keys" into o8.1