#22829 Added base implementation (wip)