Add resources
Add user data for dev/current
Merge branch 'DDBNEXT-1587-BOZ' into develop