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