Persistence cherry picks to master (for validation)