Fix IBS and ABS when the decision is computed outside the strategy
Merge branch 'feature-I/ABS' into develop