Add cap step to side-effect.
Merge remote-tracking branch 'origin/tp3' into tp3