Merge "Silence 1052 warnings"