Merge the adaptive realtime branch, which will make adding new required fields