[FIX] amend previous merge

- get final changes from c8ca7c1 in main branch