fix bug
Merge branch 'logan' of github.com:SafirSDK/safir_sdk_core into logan