LPS-51940 move wrappers into capabilities