Merge proposals dependent on lp://qastaging/~salgado/launchpad-work-items-tracker/performance-improvements

1. performance-improvements
2. Dependent merge proposals