Bugs fixing

* [NABI-RSA] TDIS-7034, TDIS-7233, TDIS-7437, TDIS-7460