Merge "Reduce technical debt"