Fix for null configuration
Merge branch 'feature/UnZipper' into develop