Merge branch 'master' into develop
DDBEASY 249 - Proper file modifiers. Removed exports.
Merge branch 'DDBEASY-249' into develop
Merge branch 'develop'