Improve pattern matching for ids.
Merge branch 'development'