Merged sjawhar and production
Permissions fix
Test