Merge "Technical Debt part 1"