Merge "Using CF_ACTION_REGISTRATION instead of CF_ACTION_ENABLE" into sc-qpr1-dev