Implemented:
CAP-48
CAP-50