Merge "Technical debt reduction"