latest master changes to fix airdate