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