Fixed train time size
Merge branch 'dev' into beta