Merge "Bouncy shape options" into main