Merge branch 'hotfix/issue2'
naga fixes
Merge branch 'hotfix/NAGA_FIX-1' into develop