Merge "Return list of one default option when shape not enabled (1/2)" into main