Merge "Multiple small changes to reduce technical debt."