solved binary comparable bug
Merge branch 'dev'