MDL-26052 data - fix various transitions that were not working ok