#187 - 1.3.x - Ds2dsAction refactor