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