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