Merge pull request #1135 from jay-hodgson/release-55

SWC-1650
SWC-1654: Next button not appearing because of new tooltip behavior