Mordor: back to mixed training stimuli creation
merge