fixed #223
Merge branch 'bug/232-nas-logging' into dev