Commit of misc meta changes before merge.