initial (partial) implementation #20581
Merge pull request #296 from lvinken/20581-capx-impl

initial (partial) implementation #20581