Added resource migration from 2.3.0 to 2.3.1
Merge branch 'dev' into release-2.3.1