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