Merge "Removing Sunny shape option" into main