Code review changes
Merge remote branch 'origin/gantt' into gantt