Merge pull request #5101 from agh1/context-abbrev