Improve conditions on transitions. Add test on exclusive merge with conditions.
Merge remote-tracking branch 'origin/FT2427_RepairAPI' into FT2427_RepairAPI