need CONVERT to make LIKE work
Merge commit 'github/testing' into beta