Merge "Enable controllers to use a custom key." into sc-dev