Merge "Create flag for cleaning up dynamic sensor data" into main