enable abbreviations
(cherry picked from commit 0ecc836)