first step to merge senslab upstream: