Lock the versions in the capabilities
Merge branch '2.5-branch' into scape-execution-interface