Better capability management

Merged Benjamin REIS requested to merge feature/better-capability into master

Merge request reports