Improve binary key recognition
Merge branch 'review/223' into megaepicmergeverything