fixes #6558 allow tag value of 0
fixes #7523 increase resource levels when exporting print prod
Merge branch 'dev' into test