Fixed error that broke similarity
Merge branch 'master' into apiv2