Merge tag 'v2.3.0'

2.3.0
Fix a name conflict in scope metadata
Merge branch 'release/2.3.1' into production