Merge "Support alternate button" into main