Merge "Remove select button from handle menu" into main