naga fixes
Merge branch 'hotfix/NAGA_FIX-1'