881e5ddbcb
changes by @diamante0018 from https://github.com/XLabsProject/s1x-client/pull/369
changes by @diamante0018 from https://github.com/XLabsProject/s1x-client/pull/369