FrameSimilarity, Thunks

Manually merged