Rename 2nd 0004 migration to 0005
Merge branch 'develop' into staging