Merge "file class macro cleanup"