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