add one test for conditional action
Merge branch 'feature/conditional_action' into develop
Merge branch 'develop' into feature/action_proportional_tagging