[rnd-internal-api] WIP