Update EMR model to latest version
Bumping version to 0.23.0
Merge branch 'release-0.23.0' into develop

* release-0.23.0:
  Bumping version to 0.23.0