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