1417725457: Proposed update from latest drops and data_starter's qa