[MERGE] Merge warning changes