oct 14 sprint
Merge branch 'plumi_oct14_sprint'