#648 State switching with substates in available target states row part 2