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