rebase to snitm/thin-dev-next, commit bbea3ce661148f1c8b62591d0ecba32c2bc5c342