Merge Internal Developer Deadlines fixes