Merge submission-sanitization branch