Allow dietary export
Merge branch 'develop'