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