[ENHANCEMENT] Backport from fork (https://github.com/a-v-k/tbdev/commit/ea36e8d) by a-v-k (https://github.com/a-v-k)